Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed boto_vpc_test failure #34141

Merged
merged 3 commits into from
Jun 21, 2016
Merged

Conversation

justinta
Copy link

@justinta justinta commented Jun 20, 2016

What does this PR do?

With new moto version 0.4.25, is_default is set to True, while on older versions it is False. This lets this test be backwards compatible with older versions of moto.

It also changes the tags to be unicode strings.

What issues does this PR fix or reference?

Failing test on jenkins, across all branches.

Tests written?

Yes

@rallytime
Copy link
Contributor

You might need to change the version check here. Not all versions of moto have the __version__ option: getmoto/moto#353

@justinta
Copy link
Author

Ah, didn't realize that. I'll update.

@justinta
Copy link
Author

@rallytime Updated the check. Let me know if that seems right.

try:
return LooseVersion(moto.__version__)
except AttributeError:
import pkg_resources
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we doing two imports like this?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No reason in particular. I just mimicked how it was in _has_required_moto(). I can pull them out, though.

@cachedout cachedout merged commit 5411ebb into saltstack:2015.5 Jun 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants